Home Explore Help
Sign In
mirrors
/
vscodium
mirror of https://github.com/VSCodium/vscodium
2
0
Fork 0
Files Issues 0 Wiki
Branch: master
Branches Tags
vscodium
/
patches
/
disable-copilot.patch

disable-copilot.patch 11 KB
Permalink History Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182 
  1. diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
    2. 

  2. index d5aa998..ea7d567 100644
    3. 

  3. --- a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
    4. 

  4. +++ b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
    5. 

  5. @@ -183,3 +183,4 @@ abstract class OpenChatGlobalAction extends Action2 {
    6. 

  6.  				ChatContextKeys.Setup.hidden.negate(),
    7. 

  7. -				ChatContextKeys.Setup.disabled.negate()
    8. 

  8. +				ChatContextKeys.Setup.disabled.negate(),
    9. 

  9. +				ContextKeyExpr.has('config.chat.disableAIFeatures').negate()
    10. 

  10.  			)
    11. 

  11. @@ -1458,3 +1459,3 @@ export function registerChatActions() {
    12. 

  12.  				precondition: ContextKeyExpr.and(
    13. 

  13. -					ChatContextKeys.Setup.installed,
    14. 

  14. +					ContextKeyExpr.has('config.chat.disableAIFeatures').negate(),
    15. 

  15.  					ChatContextKeys.Setup.disabled.negate(),
    16. 

  16. @@ -1668,3 +1669,4 @@ MenuRegistry.appendMenuItem(MenuId.CommandCenter, {
    17. 

  17.  			ChatContextKeys.Setup.hidden.negate(),
    18. 

  18. -			ChatContextKeys.Setup.disabled.negate()
    19. 

  19. +			ChatContextKeys.Setup.disabled.negate(),
    20. 

  20. +			ContextKeyExpr.has('config.chat.disableAIFeatures').negate()
    21. 

  21.  		),
    22. 

  22. @@ -1685,3 +1687,4 @@ MenuRegistry.appendMenuItem(MenuId.TitleBar, {
    23. 

  23.  			ChatContextKeys.Setup.hidden.negate(),
    24. 

  24. -			ChatContextKeys.Setup.disabled.negate()
    25. 

  25. +			ChatContextKeys.Setup.disabled.negate(),
    26. 

  26. +			ContextKeyExpr.has('config.chat.disableAIFeatures').negate()
    27. 

  27.  		),
    28. 

  28. @@ -1702,3 +1705,4 @@ registerAction2(class ToggleCopilotControl extends ToggleTitleBarConfigAction {
    29. 

  29.  					ChatContextKeys.Setup.hidden.negate(),
    30. 

  30. -					ChatContextKeys.Setup.disabled.negate()
    31. 

  31. +					ChatContextKeys.Setup.disabled.negate(),
    32. 

  32. +					ContextKeyExpr.has('config.chat.disableAIFeatures').negate()
    33. 

  33.  				),
    34. 

  34. @@ -1843,3 +1847,4 @@ MenuRegistry.appendMenuItem(MenuId.EditorContext, {
    35. 

  35.  		ChatContextKeys.Setup.hidden.negate(),
    36. 

  36. -		ChatContextKeys.Setup.disabled.negate()
    37. 

  37. +		ChatContextKeys.Setup.disabled.negate(),
    38. 

  38. +		ContextKeyExpr.has('config.chat.disableAIFeatures').negate()
    39. 

  39.  	)
    40. 

  40. @@ -1876,3 +1881,3 @@ MenuRegistry.appendMenuItem(MenuId.EditorContext, {
    41. 

  41.  		ChatContextKeys.Setup.disabled.negate(),
    42. 

  42. -		ChatContextKeys.Setup.installed.negate(),
    43. 

  43. +		ContextKeyExpr.has('config.chat.disableAIFeatures').negate(),
    44. 

  44.  	);
    45. 

  45. diff --git a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
    46. 

  46. index dbd2125..2f36f7b 100644
    47. 

  47. --- a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
    48. 

  48. +++ b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
    49. 

  49. @@ -174,3 +174,3 @@ configurationRegistry.registerConfiguration({
    50. 

  50.  			markdownDescription: nls.localize('chat.commandCenter.enabled', "Controls whether the command center shows a menu for actions to control chat (requires {0}).", '`#window.commandCenter#`'),
    51. 

  51. -			default: true
    52. 

  52. +			default: false
    53. 

  53.  		},
    54. 

  54. @@ -696,3 +696,3 @@ configurationRegistry.registerConfiguration({
    55. 

  55.  			description: nls.localize('chat.disableAIFeatures', "Disable and hide built-in AI features provided by GitHub Copilot, including chat, code completions and next edit suggestions."),
    56. 

  56. -			default: false,
    57. 

  57. +			default: true,
    58. 

  58.  			scope: ConfigurationScope.WINDOW
    59. 

  59. diff --git a/src/vs/workbench/contrib/chat/browser/chatParticipant.contribution.ts b/src/vs/workbench/contrib/chat/browser/chatParticipant.contribution.ts
    60. 

  60. index 391a4de..995590c 100644
    61. 

  61. --- a/src/vs/workbench/contrib/chat/browser/chatParticipant.contribution.ts
    62. 

  62. +++ b/src/vs/workbench/contrib/chat/browser/chatParticipant.contribution.ts
    63. 

  63. @@ -67,9 +67,8 @@ const chatViewDescriptor: IViewDescriptor[] = [{
    64. 

  64.  	ctorDescriptor: new SyncDescriptor(ChatViewPane, [{ location: ChatAgentLocation.Chat }]),
    65. 

  65. -	when: ContextKeyExpr.or(
    66. 

  66. -		ContextKeyExpr.or(
    67. 

  67. -			ChatContextKeys.Setup.hidden,
    68. 

  68. -			ChatContextKeys.Setup.disabled
    69. 

  69. -		)?.negate(),
    70. 

  70. +	when: ContextKeyExpr.and(
    71. 

  71. +		ContextKeyExpr.has('config.chat.disableAIFeatures').negate(),
    72. 

  72. +		ChatContextKeys.Setup.disabled.negate(),
    73. 

  73. +		ChatContextKeys.Setup.hidden.negate(),
    74. 

  74.  		ChatContextKeys.panelParticipantRegistered,
    75. 

  75. -		ChatContextKeys.extensionInvalid
    76. 

  76. +		ChatContextKeys.extensionInvalid.negate()
    77. 

  77.  	)
    78. 

  78. diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup.ts b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
    79. 

  79. index 4325d48..53edd2c 100644
    80. 

  80. --- a/src/vs/workbench/contrib/chat/browser/chatSetup.ts
    81. 

  81. +++ b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
    82. 

  82. @@ -953,7 +953,9 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
    83. 

  83.  					f1: true,
    84. 

  84. -					precondition: ContextKeyExpr.or(
    85. 

  85. -						ChatContextKeys.Setup.hidden,
    86. 

  86. -						ChatContextKeys.Setup.disabled,
    87. 

  87. -						ChatContextKeys.Setup.untrusted,
    88. 

  88. -						ChatContextKeys.Setup.installed.negate(),
    89. 

  89. +					precondition: ContextKeyExpr.and(
    90. 

  90. +						ContextKeyExpr.or(
    91. 

  91. +							ChatContextKeys.Setup.hidden,
    92. 

  92. +							ChatContextKeys.Setup.disabled,
    93. 

  93. +							ChatContextKeys.Setup.untrusted,
    94. 

  94. +						),
    95. 

  95. +						ContextKeyExpr.has('config.chat.disableAIFeatures').negate(),
    96. 

  96.  						ChatContextKeys.Entitlement.canSignUp
    97. 

  97. @@ -1069,3 +1071,3 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
    98. 

  98.  							ChatContextKeys.Setup.hidden.negate(),
    99. 

  99. -							ChatContextKeys.Setup.installed.negate(),
    100. 

  100. +							ContextKeyExpr.has('config.chat.disableAIFeatures').negate(),
    101. 

  101.  							ChatContextKeys.Entitlement.signedOut
    102. 

  102. @@ -1096,2 +1098,3 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
    103. 

  103.  						ChatContextKeys.Setup.hidden.negate(),
    104. 

  104. +						ContextKeyExpr.has('config.chat.disableAIFeatures').negate(),
    105. 

  105.  						ContextKeyExpr.or(
    106. 

  106. @@ -1152,2 +1155,3 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
    107. 

  107.  						ChatContextKeys.Setup.hidden.negate(),
    108. 

  108. +						ContextKeyExpr.has('config.chat.disableAIFeatures').negate(),
    109. 

  109.  						ContextKeyExpr.or(
    110. 

  110. @@ -1350,3 +1354,3 @@ export class ChatTeardownContribution extends Disposable implements IWorkbenchCo
    111. 

  111.  						ChatContextKeys.Setup.hidden.negate(),
    112. 

  112. -						ChatContextKeys.Setup.installed.negate()
    113. 

  113. +						ContextKeyExpr.has('config.chat.disableAIFeatures').negate()
    114. 

  114.  					),
    115. 

  115. @@ -1356,3 +1360,3 @@ export class ChatTeardownContribution extends Disposable implements IWorkbenchCo
    116. 

  116.  						order: 1,
    117. 

  117. -						when: ChatContextKeys.Setup.installed.negate()
    118. 

  118. +						when: ContextKeyExpr.has('config.chat.disableAIFeatures').negate()
    119. 

  119.  					}
    120. 

  120. diff --git a/src/vs/workbench/contrib/chat/browser/chatStatus.ts b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
    121. 

  121. index 05f6f0e..5f7a988 100644
    122. 

  122. --- a/src/vs/workbench/contrib/chat/browser/chatStatus.ts
    123. 

  123. +++ b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
    124. 

  124. @@ -48,2 +48,3 @@ import { MarkdownRenderer } from '../../../../editor/browser/widget/markdownRend
    125. 

  125.  import { MarkdownString } from '../../../../base/common/htmlContent.js';
    126. 

  126. +import { ContextKeyExpr, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
    127. 

  127.  
    128. 

  128. @@ -129,2 +130,3 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
    129. 

  129.  		@IChatSessionsService private readonly chatSessionsService: IChatSessionsService,
    130. 

  130. +		@IContextKeyService private readonly contextKeyService: IContextKeyService,
    131. 

  131.  	) {
    132. 

  132. @@ -132,2 +134,7 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
    133. 

  133.  
    134. 

  134. +		const rule = ContextKeyExpr.has('config.chat.disableAIFeatures');
    135. 

  135. +		if (this.contextKeyService.contextMatchesRules(rule)) {
    136. 

  136. +			return; // disabled
    137. 

  137. +		}
    138. 

  138. +
    139. 

  139.  		this.update();
    140. 

  140. diff --git a/src/vs/workbench/contrib/chat/common/chatContextKeys.ts b/src/vs/workbench/contrib/chat/common/chatContextKeys.ts
    141. 

  141. index 4877407..d11d315 100644
    142. 

  142. --- a/src/vs/workbench/contrib/chat/common/chatContextKeys.ts
    143. 

  143. +++ b/src/vs/workbench/contrib/chat/common/chatContextKeys.ts
    144. 

  144. @@ -104,4 +104,4 @@ export namespace ChatContextKeyExprs {
    145. 

  145.  	 */
    146. 

  146. -	export const chatSetupTriggerContext = ContextKeyExpr.or(
    147. 

  147. -		ChatContextKeys.Setup.installed.negate(),
    148. 

  148. +	export const chatSetupTriggerContext = ContextKeyExpr.and(
    149. 

  149. +		ContextKeyExpr.has('config.chat.disableAIFeatures').negate(),
    150. 

  150.  		ChatContextKeys.Entitlement.canSignUp
    151. 

  151. diff --git a/src/vs/workbench/contrib/mcp/browser/mcpServersView.ts b/src/vs/workbench/contrib/mcp/browser/mcpServersView.ts
    152. 

  152. index 5a12c9d..3e1f23e 100644
    153. 

  153. --- a/src/vs/workbench/contrib/mcp/browser/mcpServersView.ts
    154. 

  154. +++ b/src/vs/workbench/contrib/mcp/browser/mcpServersView.ts
    155. 

  155. @@ -530,3 +530,3 @@ export class McpServersViewsContribution extends Disposable implements IWorkbenc
    156. 

  156.  				ctorDescriptor: new SyncDescriptor(DefaultBrowseMcpServersView, [{}]),
    157. 

  157. -				when: ContextKeyExpr.and(DefaultViewsContext, HasInstalledMcpServersContext.toNegated(), ChatContextKeys.Setup.hidden.negate(), McpServersGalleryStatusContext.isEqualTo(McpGalleryManifestStatus.Available), ContextKeyExpr.or(ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceUrlConfig}`), ProductQualityContext.notEqualsTo('stable'), ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceEnablementConfig}`))),
    158. 

  158. +				when: ContextKeyExpr.and(DefaultViewsContext, HasInstalledMcpServersContext.toNegated(), ContextKeyExpr.has('config.chat.disableAIFeatures').negate(), ChatContextKeys.Setup.hidden.negate(), McpServersGalleryStatusContext.isEqualTo(McpGalleryManifestStatus.Available), ContextKeyExpr.or(ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceUrlConfig}`), ProductQualityContext.notEqualsTo('stable'), ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceEnablementConfig}`))),
    159. 

  159.  				weight: 40,
    160. 

  160. @@ -545,3 +545,3 @@ export class McpServersViewsContribution extends Disposable implements IWorkbenc
    161. 

  161.  				ctorDescriptor: new SyncDescriptor(DefaultBrowseMcpServersView, [{ showWelcome: true }]),
    162. 

  162. -				when: ContextKeyExpr.and(DefaultViewsContext, HasInstalledMcpServersContext.toNegated(), ChatContextKeys.Setup.hidden.negate(), McpServersGalleryStatusContext.isEqualTo(McpGalleryManifestStatus.Available), ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceUrlConfig}`).negate(), ProductQualityContext.isEqualTo('stable'), ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceEnablementConfig}`).negate()),
    163. 

  163. +				when: ContextKeyExpr.and(DefaultViewsContext, HasInstalledMcpServersContext.toNegated(), ContextKeyExpr.has('config.chat.disableAIFeatures').negate(), ChatContextKeys.Setup.hidden.negate(), McpServersGalleryStatusContext.isEqualTo(McpGalleryManifestStatus.Available), ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceUrlConfig}`).negate(), ProductQualityContext.isEqualTo('stable'), ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceEnablementConfig}`).negate()),
    164. 

  164.  				weight: 40,
    165. 

  165. diff --git a/src/vs/workbench/contrib/scm/browser/scm.contribution.ts b/src/vs/workbench/contrib/scm/browser/scm.contribution.ts
    166. 

  166. index a2d4dc9..3f7a511 100644
    167. 

  167. --- a/src/vs/workbench/contrib/scm/browser/scm.contribution.ts
    168. 

  168. +++ b/src/vs/workbench/contrib/scm/browser/scm.contribution.ts
    169. 

  169. @@ -659,3 +659,3 @@ registerAction2(class extends Action2 {
    170. 

  170.  					ChatContextKeys.Setup.disabled.negate(),
    171. 

  171. -					ChatContextKeys.Setup.installed.negate(),
    172. 

  172. +					ContextKeyExpr.has('config.chat.disableAIFeatures').negate(),
    173. 

  173.  					ContextKeyExpr.equals('git.activeResourceHasMergeConflicts', true)
    174. 

  174. diff --git a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
    175. 

  175. index d32554a..01d3cf6 100644
    176. 

  176. --- a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
    177. 

  177. +++ b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
    178. 

  178. @@ -1346,3 +1346,3 @@ registerAction2(class extends Action2 {
    179. 

  179.  					ChatContextKeys.Setup.disabled.negate(),
    180. 

  180. -					ChatContextKeys.Setup.installed.negate(),
    181. 

  181. +					ContextKeyExpr.has('config.chat.disableAIFeatures').negate(),
    182. 

  182.  					ContextKeyExpr.equals('scmProvider', 'git')
    183.