Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
54 changes: 0 additions & 54 deletions patches/common/remove-ask-vscode.diff

This file was deleted.

66 changes: 66 additions & 0 deletions patches/common/remove-builtin-extensions.diff
Original file line number Diff line number Diff line change
Expand Up @@ -215,3 +215,69 @@ Index: third-party-src/src/vs/workbench/services/assignment/common/assignmentFil
}

private updateCopilotEntitlementInfo() {
Index: third-party-src/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
===================================================================
--- third-party-src.orig/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
+++ third-party-src/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
@@ -800,8 +800,9 @@ configurationRegistry.registerConfigurat
'chat.disableAIFeatures': {
type: 'boolean',
description: nls.localize('chat.disableAIFeatures', "Disable and hide built-in AI features provided by GitHub Copilot, including chat and inline suggestions."),
- default: false,
- scope: ConfigurationScope.WINDOW
+ default: true,
+ scope: ConfigurationScope.WINDOW,
+ included: false
},
'chat.allowAnonymousAccess': { // TODO@bpasero remove me eventually
type: 'boolean',
Index: third-party-src/src/vs/workbench/services/chat/common/chatEntitlementService.ts
===================================================================
--- third-party-src.orig/src/vs/workbench/services/chat/common/chatEntitlementService.ts
+++ third-party-src/src/vs/workbench/services/chat/common/chatEntitlementService.ts
@@ -1199,14 +1199,11 @@ export class ChatEntitlementContext exte
}

private withConfiguration(state: IChatEntitlementContextState): IChatEntitlementContextState {
- if (this.configurationService.getValue(ChatEntitlementContext.CHAT_DISABLED_CONFIGURATION_KEY) === true) {
- return {
- ...state,
- hidden: true // Setting always wins: if AI is disabled, set `hidden: true`
- };
- }
-
- return state;
+ // Always hide AI features in this build
+ return {
+ ...state,
+ hidden: true
+ };
}

update(context: { installed: boolean; disabled: boolean; untrusted: boolean }): Promise<void>;
Index: third-party-src/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
===================================================================
--- third-party-src.orig/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
+++ third-party-src/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
@@ -713,7 +713,7 @@ export function registerChatActions() {
super({
id: 'workbench.action.chat.showExtensionsUsingCopilot',
title: localize2('showCopilotUsageExtensions', "Show Extensions using Copilot"),
- f1: true,
+ f1: false,
category: EXTENSIONS_CATEGORY,
precondition: ChatContextKeys.enabled
});
Index: third-party-src/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupContributions.ts
===================================================================
--- third-party-src.orig/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupContributions.ts
+++ third-party-src/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupContributions.ts
@@ -184,7 +184,7 @@ export class ChatSetupContribution exten
id: CHAT_SETUP_ACTION_ID,
title: ChatSetupTriggerAction.CHAT_SETUP_ACTION_LABEL,
category: CHAT_CATEGORY,
- f1: true,
+ f1: false,
precondition: ContextKeyExpr.or(
ChatContextKeys.Setup.hidden,
ChatContextKeys.Setup.disabled,
1 change: 0 additions & 1 deletion patches/sagemaker.series
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ common/build.diff
common/integration.diff
common/replace-gulp-untar.diff
common/fix-ts-rootdir-webpack.diff
common/remove-ask-vscode.diff
web-server/suppress-known-errors-build-integration.diff
web-server/local-storage.diff
web-server/base-path.diff
Expand Down
1 change: 0 additions & 1 deletion patches/web-embedded-with-terminal.series
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ common/build.diff
common/integration.diff
common/replace-gulp-untar.diff
common/fix-ts-rootdir-webpack.diff
common/remove-ask-vscode.diff
web-embedded/readd-workbench.diff
web-embedded/suppress-known-errors-build-integration.diff
web-embedded/disable-built-in-walkthroughs-from-c.diff
Expand Down
1 change: 0 additions & 1 deletion patches/web-embedded.series
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ common/build.diff
common/integration.diff
common/replace-gulp-untar.diff
common/fix-ts-rootdir-webpack.diff
common/remove-ask-vscode.diff
web-embedded/readd-workbench.diff
web-embedded/suppress-known-errors-build-integration.diff
web-embedded/disable-built-in-walkthroughs-from-c.diff
Expand Down
1 change: 0 additions & 1 deletion patches/web-server.series
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ common/build.diff
common/integration.diff
common/replace-gulp-untar.diff
common/fix-ts-rootdir-webpack.diff
common/remove-ask-vscode.diff
web-server/suppress-known-errors-build-integration.diff
web-server/local-storage.diff
web-server/base-path.diff
Expand Down